Merge recent changes from svgtex