Add CVE-2014-6278 support

Going with an OptEnum to simplify the code for now...
Adds support for both CVEs, lands #3931