Merge branch 't/blob/pathinfo' into refs/top-bases/master