Merge branch 'bug/JAL-1803_JAL-2157' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 7 Sep 2016 14:38:59 +0000 (15:38 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 7 Sep 2016 14:38:59 +0000 (15:38 +0100)

Trivial merge