Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 12 Jul 2018 13:17:13 +0000 (14:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 12 Jul 2018 13:17:13 +0000 (14:17 +0100)

Trivial merge