update from 2.20 branch, CVE-2012-3406, CVE-2014-9402

git-svn-id: file:///srv/repos/svn-packages/svn@227728 eb2447ed-0c53-47e4-bac8-5bc4a241df78