Merge branch 'topic/stm' into for-linus