From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 26 Jun 2018 17:39:35 +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~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bd76bc7ba0e4de84cb4cbe90f579289542919903;p=jalview.git

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

bd76bc7ba0e4de84cb4cbe90f579289542919903