Two more strings with class.
Merge branch 'master' into ospalh-special