Backport autosort for interpolating structures.
Automatic Py3k merge for testing