Bug fix 2551
Merge branch 'master' into avaneesh
fixing math-parser problem
Merge branch 'jonwetzel'