Merge commit 'upstream/0.1.7.dfsg'