Strings for hash keys
Merge remote-tracking branch 'remotes/upstream/master'
Merge branch 'master' into filelist