update ap:master with latest work and builds from wp:master