Merge commit '090d5c9b7755db5ce3c0d1bcc298c3b4d7d7df87' into bug

Conflicts:
	test.txt
Merge branch 'bug'

Conflicts:
	test.txt