am a0af56f6: am bd1b9e33: Merge "Sort all files found via "

* commit 'a0af56f6989d250f290257967f64f640531472f5':
  Sort all files found via $(shell find)