Merge remote-tracking branch 'vanir/kk44' into kk44

Conflicts:
	default.xml