Change-Id: Idc9e8fd0c35de48a2366dca3850bcc4e69ef997f
(cherry picked from commit afc565bf)
(cherry picked from commit 46c5197f)
Reviewed-on: https://gerrit.libreoffice.org/20368Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 69725ffe)