Merge branch 'make-sorting-functions-honor-arguments'