Merge branch 'master' into multiStyles

Conflicts:
	core/src/style/style.cpp