UniRef, Uniref, I love you both!
Merge branch 'master' into bug/names/uniref
no more Uniref
Merge branch 'bug/names/uniref'