From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 31 May 2016 18:02:01 +0000 (+0100)
Subject: Merge branch 'apifix/JAL-1926_JAL-2106' into develop
X-Git-Tag: Release_2_10_0~194^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9e24dbaa1890bc7d1751432b00463f25114bf3f5;p=jalview.git

Merge branch 'apifix/JAL-1926_JAL-2106' into develop
---

9e24dbaa1890bc7d1751432b00463f25114bf3f5