Copied from master.
Fixed paths.