Merge "toolbox-ls: sort file and directory lists"