Implement modifier destruction at horizon with an event so other things can use it
Merge branch 'master' into admin