JAL-1645 Merge branch 'develop' into Release_2_9_Branch
authorJim Procter <jprocter@issues.jalview.org>
Tue, 8 Sep 2015 17:03:23 +0000 (18:03 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 8 Sep 2015 17:03:23 +0000 (18:03 +0100)

Trivial merge