Sync with WordPress.com

Sorry, this is a horrible commit message. You'll just have to check out
the code to see what changed.