Merge branch 'mh/path-max'