From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 11 Sep 2018 13:05:00 +0000 (+0100)
Subject: Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
X-Git-Tag: Release_2_11_0~18
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b39ce946e3f05bcf923abc266df2ef33be95a672;p=jalview.git

Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
---

b39ce946e3f05bcf923abc266df2ef33be95a672