2.2
Merge branch 'master' of https://github.com/markus3/experimental

Conflicts:
	Test.txt

Console Commit...