scalar based autocomplete
Merge branch '1.3' of github.com:Illniyar/elasticsearch into 1.3