Merge branch 'dev' of github.com:WormBase/intermine into dev
Merge branch 'jw' into dev
Merge branch 'jw' of github.com:WormBase/intermine into jw
test