Merge branch 'develop' into documentation/JAL-2418_release2102
authorJim Procter <jprocter@issues.jalview.org>
Fri, 4 Aug 2017 08:12:35 +0000 (09:12 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 4 Aug 2017 08:12:35 +0000 (09:12 +0100)

Trivial merge