Merge branch 'strip-fakepath' into patches