Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 18 Apr 2019 08:31:17 +0000 (09:31 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 18 Apr 2019 08:31:17 +0000 (09:31 +0100)

Trivial merge