From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 12 Sep 2016 08:12:09 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~45^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f0ce1f46c5bb22e1db18c27e68b09516958c84d;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

2f0ce1f46c5bb22e1db18c27e68b09516958c84d