JAL-1645 Merge branch 'develop' into Release_2_9_Branch
authorJim Procter <jprocter@issues.jalview.org>
Mon, 7 Sep 2015 12:09:13 +0000 (13:09 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 7 Sep 2015 12:09:13 +0000 (13:09 +0100)

Trivial merge