[monitoring-plugins] Merge remote-tracking branch 'upstream/pr/1390'

[Jan Wagner]

 Module: monitoring-plugins
 Branch: master
 Commit: ac380fd243e4eb7f0b1ace06dbdc276a3a13a9bb
 Author: Jan Wagner <w...@cyconet.org>
   Date: Tue Nov  3 11:08:11 2015 +0100
    URL: 
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=ac380fd

Merge remote-tracking branch 'upstream/pr/1390'

---