update to 1.6.4
Merge branch 'master' into blubb

Conflicts:
	build.xml