Updating from trunk and including $ arguement autocompletion