Bring up haxe3 branch up to date with dev branch