Merge branch 'master' into primitive-hashes