Merge branch 'master' into name_hash