Reorder options alphabetically
Merge pull request #3000 from gjaldon/reorder-options

Reorder options