Merge branch 'master' into Autocomplete_revised
Changes to auto_complete
Merge branch 'Autocomplete_revised'