merge in changes from wp:master