Fixed MathJax support
Fix #740
Merge remote-tracking branch 'upstream/master'