Found two comments that still contained FlashPunk...
Moving `override` before public/private
Merge branch 'dev' into v2.6