Merge remote-tracking branch 'origin/hsmaster' into
types_hash_sizes_hsmaster

Conflicts:
	manifests/init.pp