Small fixes
Merge branch '1.1.x' into stable

Conflicts:
	docs/Ubuntu/packages-lucid.xml