Merge two strings. see #27320, #27453.

Built from https://develop.svn.wordpress.org/trunk@27645


git-svn-id: http://core.svn.wordpress.org/trunk@27488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Add context to 'Browse' (themes). see #27055, #27453.

Built from https://develop.svn.wordpress.org/trunk@27646


git-svn-id: http://core.svn.wordpress.org/trunk@27489 1a063a9b-81f0-0310-95a4-ce76da25c4cd