Make combine_things test function deterministic
Merge branch 'master' into unicode_io