path completion
Merge branch 'master' into turanga

* master:
  path completion