Merge pull request #1685 from esdrubal/touint64