(cherry picked from commit d5016b01)

Change-Id: Ief31d8153fdbf91cdd29df5ac7801bd88a98542e
Reviewed-on: https://gerrit.libreoffice.org/19955Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d11d0915)