Merge branch 'develop' into release/2_9_documentation
authorJim Procter <jprocter@issues.jalview.org>
Tue, 8 Sep 2015 12:34:17 +0000 (13:34 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 8 Sep 2015 12:34:17 +0000 (13:34 +0100)

Trivial merge