added CVE-2013-5958
Merge branch '2.0' into 2.1
Merge branch '2.1' into 2.2