From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 2 Aug 2016 13:16:06 +0000 (+0100)
Subject: Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
X-Git-Tag: Release_2_10_0~120^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7bb6b59dd073527789532e1351f051f365d6747a;hp=-c;p=jalview.git

Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
---

7bb6b59dd073527789532e1351f051f365d6747a