Merge 0.9.1-debian branch back into master branch