These changes should be in master but first appeared in VTK's third-party-library copy of the token library.