merge #2915 (closes #2915, closes #2910)
merge #2915 (closes #2915, closes #2910)

pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe,pleclech/hacking-haxe