Cherry pick patch from opensuse
Sasi let me know that they have a nice patch we should cherry pick: https://github.com/openSUSE/planet-o-o/commit/6ee40422eab3f471b3f9076160fbc17f24994e5a
Sasi let me know that they have a nice patch we should cherry pick: https://github.com/openSUSE/planet-o-o/commit/6ee40422eab3f471b3f9076160fbc17f24994e5a