Merge branch '1700_space_in_color_name'