Merge branch 'bugfix/JAL-841_JAL-1081' into develop
authorJim Procter <jprocter@issues.jalview.org>
Sat, 5 Sep 2015 11:34:23 +0000 (12:34 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Sat, 5 Sep 2015 11:34:23 +0000 (12:34 +0100)

Trivial merge