Merge tag 'upstream/0.8.4'

Upstream version 0.8.4
Bump Standards-Version to 3.9.5, no changes necessary
Update changelog for 0.8.4-1~1.gbp08c650 release