Wordpress 3.9 changes
Prep for Wordpress 3.9 upgrade
Merge branch 'upgrade/wordpress-3.9' into dev