From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 20 Oct 2016 11:17:15 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~21
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=e93f667b9baceb1d42ba8e9895df67831e6b1866

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

e93f667b9baceb1d42ba8e9895df67831e6b1866