Imported Upstream version 2.8.2+dfsg1
Merge branch 'upstream'

* upstream:
  Imported Upstream version 2.8.2+dfsg1
Add debian/gbp.conf
Don't remove alternative when upgrade

See https://bugs.debian.org/71621.

Git-Dch: Short