Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus