Merge branch 'master' into utf8