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

[Andreas Baumann]

 Module: monitoring-plugins
 Branch: feature_check_curl
 Commit: 6faf1ae2d0d3a58aecbabd527125790f5d564e2b
 Author: Andreas Baumann <mail at andreasbaumann.cc>
   Date: Fri May  5 08:38:44 2017 +0200
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=6faf1ae

Merge branch 'master' into feature_check_curl

---