Update master and prep for merge