Merge branch 'nd/literal-pathspecs'