Build fix.
Another build fix.
Merge remote-tracking branch 'icinga2/master'