Fixed exploit. Thanks Sykranos
Merge branch 'master' into darkrpfpp