[icinga-checkins] icinga.org: icinga2/master: Merge branch 'support/2.5'

[git at icinga.org]

Module: icinga2
Branch: master
Commit: 53e24964c8fb3d4576b48f5f55be237c3a725c48
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=53e24964c8fb3d4576b48f5f55be237c3a725c48

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Tue Aug 23 15:01:09 2016 +0200

Merge branch 'support/2.5'

---