Merge branch 'topic/sun' into for-linus