This prepares 1.1.2 for byzantium. Using a diff against the last debian version should make it easier to review.
