the quest for safe strings, and better colours
Merge branch 'master' into next