Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint