Scatter and Gather v.01
Merge remote-tracking branch 'upstream/master'

Conflicts:
	imgdiff_mpi