Merge remote-tracking branch 'forestergit/master' into JalviewIntegration
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 20 Nov 2017 15:25:47 +0000 (15:25 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 20 Nov 2017 15:25:47 +0000 (15:25 +0000)

Trivial merge