From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 18 Aug 2017 10:53:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into feature/JAL-2664
X-Git-Tag: Release_2_10_3b1~142^2~2^2~10^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d3dcf0d782022eba87ebfd29a66f273753fdf7ce;p=jalview.git

Merge remote-tracking branch 'origin/develop' into feature/JAL-2664
---

d3dcf0d782022eba87ebfd29a66f273753fdf7ce