Squashed 'wp/' changes from 47520b3..8422210


git-subtree-dir: wp
git-subtree-split: 842221094a5011886291b21fd7c705835d69e0bc
WordPress 4.0 "Benny"

Merge commit '279d0031404958142250baa66f8a6c533d5be983'