Autocomplete Other Matches options
Merge branch 'autocomplete-peter'