merge with upstream math parser changes
fixed symlinks