Unbreak server exploits
Merge branch 'release' into 'master'