Update gxp
Merge branch 'master' into wmplus