From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 7 Aug 2017 13:31:35 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_2_Branch
X-Git-Tag: Release_2_10_2~3^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f349b5e01b0d203eae42caa3f21e4268edc14cdc;p=jalview.git

Merge branch 'develop' into releases/Release_2_10_2_Branch
---

f349b5e01b0d203eae42caa3f21e4268edc14cdc