From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 23 Jun 2016 13:58:42 +0000 (+0100)
Subject: Merge branch 'develop' into merge_JAL-2110
X-Git-Tag: Release_2_10_0~140^2~5^2~36
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d2299844ae932a515a5007f30caf766a2c83ad97;p=jalview.git

Merge branch 'develop' into merge_JAL-2110
---

d2299844ae932a515a5007f30caf766a2c83ad97