Merge pull request #2606 from kbrunham-intel/fix/2605 Fix timescale CRLF // comments leaving CR in the token