Merge branches 'master' and 'devel' into for-linus