Update Math extension to master

Change-Id: I8fe89bca9a3cdf07e066067fc7cc923739b786f0
Merge "Update Math extension to master" into wmf/1.21wmf9