Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 27 Mar 2019 17:07:24 +0000 (17:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 27 Mar 2019 17:07:24 +0000 (17:07 +0000)

Trivial merge