JC-1507 Added ability to use @ for autocomplete.
Merge remote-tracking branch 'origin/master'