r_colorBits now defaults to 32
Fixed bug that caused compilation to fail
Merge remote-tracking branch 'upstream/master'