Workaround CVE-2013-0156
Merge branch 'master' of github.com:anythinglabs/aaed