Add a value check.
Merge remote-tracking branch 'upstream/2.5-dev' into 2.5-surfsara
increased debian verion. fixed  CVE-2014-8729 security issue