un pipe the diff, so that it works on lectura
Merge commit 'dda261ca06bae564ca9f3a53e70f7a85bfb3ebe7'

Conflicts:
	test.sh