Merge branch 'develop' into features/JAL-2909_bamImport2_11
authorJim Procter <jprocter@issues.jalview.org>
Wed, 21 Mar 2018 16:48:52 +0000 (16:48 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 21 Mar 2018 16:48:52 +0000 (16:48 +0000)

Trivial merge