Backport of https://github.com/owncloud-ci/appimage-build/commit/e940a0d4702e383ec4a57b9592a18c2fdf738946 and https://github.com/owncloud-ci/appimage-build/commit/c099406c791145b77f3643777c33e3327372d21c
@vonreth