Merge branch 'mwf-solaris-no-utf8'