Initial merge with WordPress 4.0.0