Merge 2.5.x into master, for CVE-2014-3598/2.5.3 changes