Making strings consistent
Merge branch 'master' into courier