From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 28 May 2018 08:19:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop
X-Git-Tag: Release_2_11_0~37
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=252ddd218b716396b003b3fcbe0f8da499bde8c8;p=jalview.git

Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop

Conflicts:
	src/jalview/io/FeaturesFile.java
---

252ddd218b716396b003b3fcbe0f8da499bde8c8