3.2.6 ga
Merge remote-tracking branch 'origin/master' into eugen_Maven_Scripts

Conflicts:
	pom.xml
3.2.6