Merge branch 'topic/owl' into for-linus