From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 3 Nov 2016 19:29:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into bug/JAL-2282
X-Git-Tag: Release_2_10_1^2~12^2^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=351d30743b02e4f967f4804f7005a28c52985774;p=jalview.git

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

351d30743b02e4f967f4804f7005a28c52985774