Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 31 Mar 2020 13:42:09 +0000 (14:42 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 31 Mar 2020 13:42:09 +0000 (14:42 +0100)

Trivial merge