labels; refs #489 too
Merge branch 'dev' of github.com:intermine/intermine into dev