From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 7 Sep 2016 11:46:28 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-1803_JAL-2157
X-Git-Tag: Release_2_10_0~47^2~4^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3f12f4932226512316ec113e600695150431fd0a;p=jalview.git

Merge branch 'develop' into bug/JAL-1803_JAL-2157
---

3f12f4932226512316ec113e600695150431fd0a