From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 15 Sep 2017 10:43:20 +0000 (+0100)
Subject: Merge branch 'develop' into trial_merge/JAL-1950
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ac0c81576e51361be0c2afa265d006b516c43def;p=jalview.git

Merge branch 'develop' into trial_merge/JAL-1950
---

ac0c81576e51361be0c2afa265d006b516c43def