From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 10 Sep 2015 15:35:47 +0000 (+0100)
Subject: Merge branch 'develop' into Release_2_9_Branch
X-Git-Tag: Jalview_2_9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frelease%2FJAL-1645_r29;p=jalview.git

Merge branch 'develop' into Release_2_9_Branch
---

5b799d7fe9409cb9c05368696fae182e25fc7348