Merge branch 'develop' into documentation/JAL-2418_release2102
authorJim Procter <jprocter@issues.jalview.org>
Wed, 2 Aug 2017 16:01:50 +0000 (17:01 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 2 Aug 2017 16:01:50 +0000 (17:01 +0100)

Trivial merge