Update the mathtex branch so that it includes the latest fixes from trunk.
Creating a branch for mathtex integration.