From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 14 Aug 2017 16:25:16 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_2_Branch
X-Git-Tag: Release_2_10_2~3^2~4
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=658f436fd4341ceafc55ab9b5165ed485a05465e;hp=-c

Merge branch 'develop' into releases/Release_2_10_2_Branch
---

658f436fd4341ceafc55ab9b5165ed485a05465e