Unittest and testdata hash for issue #471
Fixing conflicts Merge remote-tracking branch 'origin/master' into aggregation

Conflicts:
	Makefile