Revert "11 12"

This reverts commit 44efb5bdee61e6f47bc2b5b6727a0e47577588db.

Conflicts:
	test.txt
Merge branch 'master' into wjp-branch