Minor work.
Merge branch 'master' into colorFlags