First release
Merge remote-tracking branch 'origin/1.1' into 1.1

Conflicts:
	src/main/assemblies/zip-bin.xml