Forgot to commit my haxe3 stuff!
Merge remote-tracking branch 'larsiusprime/master'