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