Merge "Sort output of a find command in makefile" into nyc-dev