Merge remote-tracking branch 'origin/develop' into kjvdh/features/PhylogenyViewer
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 5 Dec 2017 10:06:24 +0000 (10:06 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Tue, 5 Dec 2017 10:06:24 +0000 (10:06 +0000)

Trivial merge