Prep for Wordpress 3.9 upgrade