Merge branch 'topic/vmaster-update' into for-linus