using 1.5 snapshot
Merge remote-tracking branch 'origin/upstream-I18n-develop' into admin3

Conflicts:
	pom.xml