Merge branch 'Autocomplete_revised'
Merge branch 'master' into Autocomplete_revised