Merged from debian branch