Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 1 Nov 2016 16:11:05 +0000 (16:11 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 1 Nov 2016 16:11:05 +0000 (16:11 +0000)

Trivial merge