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