(cherry picked from commit 86d2cdda)

Change-Id: I0a876e9afa9a90f312d68611a8adf5a962da784d
Reviewed-on: https://gerrit.libreoffice.org/17413Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>