Merge remote-tracking branch 'origin/master' into batching
Minor DebugAppearance improvements
Merge branch 'batching' into columbusView