Switched more code to using more efficient index buffers.
Merge remote-tracking branch 'origin/master'