Merge commit 'e723d85b97c0263f397fc7fc3d3e193ebcac395e' into testbranch

Conflicts:
	main.cpp
Merge branch 'master' into testbranch

Conflicts:
	main.cpp
new line in test branch
Merge branch 'testbranch'

Conflicts:
	main.cpp