Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 10 Oct 2017 12:42:09 +0000 (13:42 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 10 Oct 2017 12:42:09 +0000 (13:42 +0100)

Trivial merge