Merge branch 'unreleased'.
Update gbp.conf to point to the correct debian branch
Fix interpreter for contrib/bk_buildbot.py
New release: 0.8.7-1