(cherry picked from commit cbe2b9cb)
(cherry picked from commit 2b942719)

Change-Id: Ie6863f446aa688bc1bb3f725ee31e9984dadc7a4
Reviewed-on: https://gerrit.libreoffice.org/19466Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit c7f1f227)