Merged with WordPress branch 3.6 r24909.
Merged with WordPress branch 3.6 r24911.
Merged with WordPress branch 3.6 r24914.
Merged with WordPress branch 3.6 r24916.
Merged with WordPress branch 3.6 r24918.
Merged with WordPress branch 3.6 r24921.
Merged with WordPress branch 3.6 r24923.