Merge branch 'autocomplete', remote-tracking branch 'origin' into autocomplete