nagios perfdata output, and regcomp fix
Merge branch 'master', remote branch 'origin' into HEAD