3.1.5

Improve sortKeys (#556)

Rather than using string-based sorting all the time, instead we try to
find patterns where the keys are all numbers, and sort using their
numeric values instead

Covered by additional unit tests