From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 24 Mar 2017 09:44:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into bug/JAL-2314
X-Git-Tag: Release_2_10_2~3^2~141
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8f9537bd5d7f4455c6309569e2ca260463b7d2e4;p=jalview.git

Merge remote-tracking branch 'origin/develop' into bug/JAL-2314
---

8f9537bd5d7f4455c6309569e2ca260463b7d2e4