Support 'x' token for milliseconds

Requested by #1938