Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 10 Aug 2017 11:56:12 +0000 (12:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 10 Aug 2017 11:56:12 +0000 (12:56 +0100)

Trivial merge