First testing branch commit
Merge branch 'master' into testing

Conflicts:
	template.cpp