Merge branch 'implement-mathjax-support'