Make GetColorInt check if color name is valid to avoid ColorConverter throwing an exception
Fixed typo
Merge branch 'upstream'