Develop wordpress

Merge from develop into the Wordpress dev branch.