closes #348
Merge branch 'intermine-1.2.1' of github.com:intermine/intermine into intermine-1.2.1