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

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

f4198275905d9a1b30eecb293288eaae9587c749