Merge branch 'topic/async' into for-linus