Merge branch 'master' into mutable-strings