Merged in NagiosEnterprises/nagiosvshell 2.x branch b24ef7fe0f3615fefd30adc999dd4631b5a60df5 changes