Code

Merge branch 'na/strtoimax' into maint