Merge branch 'topic/fixes' into for-linus