Merge remote-tracking branch 'origin/master'

Conflicts:
	data/catalog_individuals/batch_10.genepop
	data/catalog_individuals/batch_10.haplotypes_genotypes.tsv
	data/catalog_individuals/batch_10.haplotypes_populations.tsv
	data/catalog_individuals/batch_10.hapstats.tsv
	data/catalog_individuals/batch_10.markers.tsv
	data/catalog_individuals/batch_10.plink.map
	data/catalog_individuals/batch_10.plink.ped
	data/catalog_individuals/batch_10.populations.log
	data/catalog_individuals/batch_10.sumstats.tsv
	data/catalog_individuals/batch_10.sumstats_summary.tsv