Merge from 'nagios' branch