Merged pull request
Merge branch 'master' of ssh://github.com/ziccardi/jnrpe