Merge "Fix buffer overflow security vulnerability (CVE-2014-9495)"