Applied patch from Vladimir N. Oleynik <dzo@simtreas.ru> to do tab-completion