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