From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 9 Feb 2017 11:50:07 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2316
X-Git-Tag: Release_2_10_3b1~346^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeatures%2FJAL-2316;hp=--cc;p=jalview.git

Merge branch 'develop' into features/JAL-2316
---

01f25e260a8c336119462420a1c2a11512293b41