Changes required for WordPress 3.6+