Merge branch 'topic/jz' into for-linus