Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 13 Sep 2016 14:52:11 +0000 (15:52 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 13 Sep 2016 14:52:11 +0000 (15:52 +0100)

Trivial merge