Fireball slow time fix
Merge remote-tracking branch 'origin/SlowtimeAdd'