Update Math to master

Change-Id: Idaf81d69fafb5a2876f147d134452d130fe35aed