Merge remote-tracking branch 'sm/master'

Conflicts:
	default.xml