Updated version
Merge branch 'master' into wordpress.org