Fix a bug that caused the server to crash on deletes.
Merge branch 'next' into merge_br