G1: Allow for "," in timestamps (3,132 instead of 3.132)
upstream merge from 'master'