x
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/org/example/testing/case1/sample.xml