HCOLL-121 reverted back to what luca had
Merge remote-tracking branch 'origin/master'

Conflicts:
	lang/pom.xml