Changes to build process
Merge branch 'haxe2' into haxe3