Address CVE-2014-3210

ps. I hate git and rebases and stuff