Merge commit 'debian/1.0.6-3'