Address CVE-2012-6652. Closes #623
Merge pull request #643 from fgeek/2012-6652

Address CVE-2012-6652. Closes #623