Initial merge with WordPress 3.8.1