Merge branch 'develop' into features/JAL-2349_matrixvis
authorJim Procter <jprocter@issues.jalview.org>
Mon, 17 Jul 2017 16:09:21 +0000 (17:09 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 17 Jul 2017 16:09:21 +0000 (17:09 +0100)

Trivial merge