Merge branch 'topic/img' into for-linus