Fixed server-side crash
Merge branch '1.0.4b'