Provide autocomplete with a value to use as the text in the input field. Closes #502
Merge branch 'master' into production