From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 3 Apr 2017 13:13:46 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-2314
X-Git-Tag: Release_2_10_2~3^2~140
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=667623e455de6756776d445c800d39d93fa060e2;p=jalview.git

Merge branch 'develop' into bug/JAL-2314
---

667623e455de6756776d445c800d39d93fa060e2