- Ensure all old alarms are canceled before we make a bunch of new ones
Merge remote-tracking branch 'origin/master'
- Incremented database version