Add MathJax plugin
Merge with upstream
Merge with master