Merge: Allow the display order of multichoice options to be specified #17