Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 19 Sep 2017 14:05:01 +0000 (15:05 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 19 Sep 2017 14:05:01 +0000 (15:05 +0100)

Trivial merge