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

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

71b7dc2dbc920391e3209bde9e915dd3436871f3