Updated for WordPress 3.8.1