Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 11 Oct 2017 19:28:38 +0000 (20:28 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 11 Oct 2017 19:28:38 +0000 (20:28 +0100)

Trivial merge