Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hpgc/partition.h
	src/hpgc/task.h