Merge pull request #378 from glynnc/master

Rename effect_speed/effect2_speed to current_effect/finish_effect