Initial merge with WordPress 4.0.0
Remote stray characters.
Merge remote-tracking branch 'origin/master' into latest