refs #451
Merge branch 'dev' of github.com:intermine/intermine into dev