Merging from HaxeFlixel