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