Update WP version
Merge branch 'master' into master-cmw