fix for issue #273
Merge remote-tracking branch 'origin/dev' into flixelNME