Sync with wordpress.org, WordPress 3.5.2