Modified parsing of TEMP and TSHOCK in collate to something less problematic (now we do not need the point)
Modified parsing of TEMP and TSHOCK in collate to something less problematic (now we do not need the point)

cespaillat/EDGE,cespaillat/EDGE