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

Trivial merge