Fix for CVE-2013-0155
Merge remote-tracking branch 'upstream/2-3-stable' into 2-3-stable-gempec