Sync with published version in WP SVN