Fix sorting order in supported platforms
Merge remote-tracking branch 'rodrigo/sort'