Pulled in upstream changes
Updated syntax files, including pulling in upstream changes