Merge remote-tracking branch 'origin/develop' into kjvdh/features/PhylogenyViewer
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 28 Nov 2017 17:47:50 +0000 (17:47 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 28 Nov 2017 17:47:50 +0000 (17:47 +0000)

Trivial merge