Merge branch 'apifix/JAL-1926_JAL-2106' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 1 Jun 2016 13:34:42 +0000 (14:34 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 1 Jun 2016 13:34:42 +0000 (14:34 +0100)

Trivial merge