makeSam: reorder options so the most common ones are at the top
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'mike/master'