Merge branch 'develop' into documentation/JAL-2418_release2102
authorJim Procter <jprocter@issues.jalview.org>
Tue, 15 Aug 2017 13:54:20 +0000 (14:54 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 15 Aug 2017 13:54:20 +0000 (14:54 +0100)

Trivial merge