Master

Merge request basically containing the changes of bug #1101482. It does not change the maintainer nor the location in Salsa. I also did not created pristine-tar branch and left the quilt patch applied as it was in your original repository. Feel free to upload as your own change, no need to keep me as changelog owner.