CVE 2013 4546

Merged username-removed-5302 requested to merge cve_2013_4546 into master