From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 26 Jan 2017 11:40:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into features/JAL-2316
X-Git-Tag: Release_2_10_3b1~346^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8358d28676df76a80e4b53af1d7ef2459e4f840b;p=jalview.git

Merge remote-tracking branch 'origin/develop' into features/JAL-2316
---

8358d28676df76a80e4b53af1d7ef2459e4f840b