Merge branch 'Westacular-autocomplete'