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