Update WordPress 4.0 prep to changeset 29539
Update WordPress 4.0 as of changeset 29575