Sync to latest upstream head

XIYUE DENGrequested to merge
(removed):master into master

This fixes https://bugs.debian.org/919035, as well as other packaging clean-ups. PTAL.

Merge request reports