merge pixi 1.6 dev