From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Mon, 20 Nov 2017 15:25:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'forestergit/master' into JalviewIntegration
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=642ccb75fc1e4cb7def346cb2f56191907f82a34;p=jalview.git

Merge remote-tracking branch 'forestergit/master' into JalviewIntegration
---

642ccb75fc1e4cb7def346cb2f56191907f82a34