Correctly place math elements.
Merge branch 'master' into 2013