From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 10 Aug 2017 11:56:12 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_3b1~132^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=78e1accb64429ec0630d237bf2268d733076aa6f;p=jalview.git

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

78e1accb64429ec0630d237bf2268d733076aa6f