More create room changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuickText/QuickText.v12.suo