Merge remote-tracking branch 'origin/develop' into kjvdh/features/PhylogenyViewer