pull new upstream for function; work on #305
pull new upstream for function; work on #305

geneontology/amigo,geneontology/amigo,raymond91125/amigo,geneontology/amigo,geneontology/amigo,raymond91125/amigo,raymond91125/amigo,raymond91125/amigo,raymond91125/amigo,geneontology/amigo,geneontology/amigo,geneontology/amigo,raymond91125/amigo