From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 19 Sep 2017 14:05:01 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_3b1~131
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b640bc44f5446055337fa4b00c434e7e2db6f443;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

b640bc44f5446055337fa4b00c434e7e2db6f443