Merge nagios from develop