Fixed bug with unsetting injected property
Merge branch 'haxe2' into haxe3