Imported Upstream version 3.0+dfsg0
Merge tag 'upstream/3.0+dfsg0'

Upstream version 3.0+dfsg0