Merging back WP.org changes.