From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 29 Nov 2016 13:25:45 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_3b1~396
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b3ff575126349c79f25dcba8526ed8828d668db1;p=jalview.git

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

b3ff575126349c79f25dcba8526ed8828d668db1