Bug 849908 - Handle alarm offsets
Merge pull request #8635 from KevinGrandon/bug_849908_alarm_offset

Bug 849908 - Handle alarm offsets