Merge "New argument to hint at locale to use for sorting."