Merge branch 'master' into expand-us-gb-dict