raistlinthewiz/voxeliq — pull request #40 by raistlinthewiz (2013-01-02 17:02:42+00:00)
Title: Sync. master with develop.

Sync. master with develop.