Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 12 Jan 2018 15:45:47 +0000 (15:45 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 12 Jan 2018 15:45:47 +0000 (15:45 +0000)

Trivial merge