Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 29 Sep 2017 14:31:59 +0000 (15:31 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 29 Sep 2017 14:31:59 +0000 (15:31 +0100)

Trivial merge