From: kiramt <k.mourao@dundee.ac.uk>
Date: Mon, 24 Oct 2016 17:29:46 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_1^2~29
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=85fae7bf6cc1e78c966ca0a78194664ad0c1fcac;p=jalview.git

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

85fae7bf6cc1e78c966ca0a78194664ad0c1fcac