Sync with wordpress.org repo trunk.