Merge branch 'master', remote-tracking branch 'upstream/master'
potential coding piece that could lead geneid.map to fail (but does not for tggates)