Merge branch 'hotfix-2.2.13'
Merge branch 'hotfix-2.2.13'
Event description in alert e-mail subject made optional, fixes #231
Merge branch 'hotfix-2.2.14' into develop