Merge branch '2288_path_autocompletion'