Second time is a charm.
Merge branch 'master' of https://github.com/TomCrypto/Voxel