From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 19 Oct 2016 15:52:33 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=90e36c3c8b4dcff5e41ef63c19f1881e86f995a3;p=jalview.git

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

90e36c3c8b4dcff5e41ef63c19f1881e86f995a3