Case 6
Merge remote-tracking branch 'origin/master'

Conflicts:
	tools/simplecms/data/other/pages.xml
Case 6