Merge pull request #1132 from ZappoMan/master

Fix voxel server crashes