Updated tabcomplete
Merge pull request #3338 from erming/master

Updated tabcomplete