Merge "Fixes a crash ColorScheme#toString" into tm-dev