Merge branch 'master' into dev
Fixes a bug that would crash the server.

I am ashamed that this ever went into production.
Merge branch 'dev'
v2.0.8 Final