Merge from 'pnp4nagios' branch