Bug fixed in master's hotfix branch
Merge branch 'master' into develop

Conflicts:
	test.css