generated artifactItem
Merge remote-tracking branch 'origin/enterprise' into enterprise

Conflicts:
	pom.xml