This fixes various strtoll/strtol issues, including tests
Merge branch 'strtoll' into patches