Hotfix 1.1b
Merge branch '1.1b'

Conflicts:
	TEST.txt