Update for WordPress 3.6 support