Prep for Wordpress 3.7.1 upgrade
Merge branch 'upgrade/wordpress-3.7.1'