Proposed Windows-related color problem fix...
Merge origin/master
Hopefully this fixes a ton of stuff... I think it is production code, but who knows?