Upstream: Match 1.10 release Upstream ref 919d5c050767417e22f86603aa553c5528d3fe2a

The majority of changes in this update are to do with ellipses although there are some other sizing changes as well
Forgot to add colorclasses.edc in the last update