Merge "(bug 26909) follow up r102947: fix the navigation with 'dir' and 'continue...