Merge from cupcake: "Alpha-sort lists of proprietary files"