(cherry picked from commit def95cfb)

Conflicts:
	svgio/source/svgreader/svgtoken.cxx

Change-Id: I1208229a86807ce271a823415e9b8f0baf955e01