Validating
Merge remote-tracking branch 'origin/master'

Conflicts:
	l5/XMLDemo/src/etc/test ordered.xml