[monitoring-plugins] Merge branch 'master' into feature_check_curl

[Andreas Baumann]

 Module: monitoring-plugins
 Branch: feature_check_curl
 Commit: d4bcf9901f2f45b20bdd23e17b154ebaf7edd1bc
 Author: Andreas Baumann <m...@andreasbaumann.cc>
   Date: Thu Apr 27 07:48:12 2017 +0200
    URL: 
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=d4bcf99

Merge branch 'master' into feature_check_curl

---