Merge branch 'jc/dotdot-is-parent-directory'