haxe 2.10 backport

--HG--
branch : haxe-2-10
Merge with haxe-2-10