Prep for Wordpress 3.6.1 changes