Merged with WordPress branch 3.6 r25360 (3.6.1)