Merge master features

Conflicts:
	Math.i18n.php
	MathLaTeXML.php
	MathRenderer.php
	MathTexvc.php
	tests/MathLaTeXMLTest.php

Change-Id: I4c60ceffd0fee84d9fd08323c9e6ee84e0031b90