Compatible with MathJax Safe mode
merge master