Merge Twenty Fifteen commits [30801-30806], [30808-30811] to the 4.1 branch.

Built from https://develop.svn.wordpress.org/branches/4.1@30814


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