Erase effects that have expired (Fixes #2134)
Merge remote-tracking branch 'miroslavr/master'