Merge branch 'mw/pathinfo'