Fixed for WordPress 4.0 +
Merge Master