Merge branch 'apifix/JAL-1926_JAL-2106' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 31 May 2016 18:02:01 +0000 (19:02 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 31 May 2016 18:02:01 +0000 (19:02 +0100)

Trivial merge