added CVE 2014-4931
Merge branch '2.3' into 2.4

* 2.3:
  added CVE 2014-4931