Merge commit 'c1771d3e2ed08bd1f0727f7d5021a30650dfef71' into develop

Conflicts:
	tests/library/Zaboy/applicationTest.ini