syncing with WP.org repo
Merge branch 'release/1.2'