reactivate actual firing of alarms (d'oh)
Merge remote-tracking branch 'origin/release-1.2' into release-1.2