Merge branch 'feature/JAL-2759' of https://source.jalview.org/git/jalview.git into...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jan 2018 14:04:43 +0000 (14:04 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jan 2018 14:04:43 +0000 (14:04 +0000)

Trivial merge