Merge branch 'master' into ptics_time_fixes
I prefer to use unicode for all.
I prefer to use unicode for all.