automerge: 8965a8d * commit '8965a8da5513cf31a313ecdac3506718c2813932': Properly recognize repeating wakeup alarms