Fix autocomplete ordering, fixes #368
Merge branch 'master' into builds
7.871