Small fixes (distro packages)
Merge branch '1.1.x' into stable
Updated CHANGELOG