Merge pull request #1237 from danw/no_reload_with_restat

Support restat when rebuilding manifest