Manually merged updates from the old debian branch