use gxp master now that stuff has been merged in