From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 22 Aug 2017 12:36:28 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_3b1~148
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=17d48a9d85ad1feb5074dbf605f54cfd399ca59b;p=jalview.git

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

17d48a9d85ad1feb5074dbf605f54cfd399ca59b