Merge branch 'ff/nagios'