From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 2 May 2017 12:46:06 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2393customMatrices
X-Git-Tag: Release_2_10_2~3^2~105^2~2^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2ad2916d73a8e7cf262e58db1cbdaf2dc29c5e6a;hp=-c;p=jalview.git

Merge branch 'develop' into features/JAL-2393customMatrices
---

2ad2916d73a8e7cf262e58db1cbdaf2dc29c5e6a