From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 4 May 2017 14:56:42 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_2~3^2~105
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=773ac00a0ac2eb882e993e567a650ee4d7df3dda;p=jalview.git

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

773ac00a0ac2eb882e993e567a650ee4d7df3dda