do not double-declare vars to keep java happy
Merge branch 'development' of https://github.com/HaxeFoundation/haxe into development