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

Trivial merge