add exploit fix
Merge branch 'master' into heroku
remove unneeded exploit fix