Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11