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

Trivial merge