From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 26 Jun 2018 16:08:17 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-BH/JAL-3026
X-Git-Tag: Release_2_11_4_0~45^2~18^2~629^2~2^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b79a765dc596fe14498db9ccd368736dc81ba7e2;p=jalview.git

Merge branch 'develop' into Jalview-BH/JAL-3026
---

b79a765dc596fe14498db9ccd368736dc81ba7e2