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

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

1ad00ab0925e2668bf8327984df1a816ef9e83e6