Merge branch 'topic/print_fixes' into for-linus