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

Trivial merge