completer rewritten to fit in the changed api
displaytext and description swapped
Merge remote-tracking branch 'chiel/master' into working
Merge branch 'working' into working_binaries