Merge branch 'master' into update-wordpress-411