Merge pull request #1840 from ktsaou/master

set up-delay on web alarms;