Fix for removing events while still updating the stage.
Merge branch 'dev'