Updated tabcomplete
Merge pull request #3325 from erming/master

Updated tabcomplete