From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 23 Nov 2016 14:37:08 +0000 (+0000)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3956359ebd542bc69f68fdea4ee47fac7f5e7dff;p=jalview.git

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

3956359ebd542bc69f68fdea4ee47fac7f5e7dff