Delete line 4 for merging test.
Merge branch 'master' into pr-branch

Conflicts:
	test-file
Merge pull request #2 from Sophira/pr-branch

Delete line 4 for merging test.