Reviewed-on: https://gerrit.libreoffice.org/17547Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 68279e04)

Conflicts:
	external/libwpg/ExternalPackage_libwpg.mk

Change-Id: Ied2f331000c83d696fb5dd662860c3b51b95c616
Reviewed-on: https://gerrit.libreoffice.org/17796Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>