Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Mar 2019 16:13:39 +0000 (16:13 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Mar 2019 16:13:39 +0000 (16:13 +0000)

Trivial merge