(cherry picked from commit d7fa73b2)

Conflicts:
	drawinglayer/source/tools/converters.cxx

Change-Id: Ia8edda4ca2c79bfc9d4a0962f99d8db581622a7d