From: kiramt <k.mourao@dundee.ac.uk>
Date: Mon, 24 Apr 2017 09:52:12 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_3b1~307^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a5e3847ec3e20a6130c07fb6f6f223c30639a3f2;p=jalview.git

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

a5e3847ec3e20a6130c07fb6f6f223c30639a3f2