(cherry picked from commit ee3d40b3)

Change-Id: I451f02ee93a798c9c1712082d59a7ff96b0d4a4e
Reviewed-on: https://gerrit.libreoffice.org/16508Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>