Imported Upstream version 5.2.2
Merge tag 'upstream/5.2.2'

Upstream version 5.2.2
Update gbp.conf for newer version