Wordpress 3.6.1 changes
Merge branch 'upgrade/wordpress-3.6.1'