Merge commit 'e26a9e0' into stable/for-linus-3.15