Restore support for replacing CAPITAL colour codes.
Merge branch 'temp1' into 2.9