Merge with HaxeIDE fork