Adding new testcase.
Testing.
Merge branch 'master' into dev

Conflicts:
	test-results.tab
Merge branch 'dev' into test