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