Sync of https://github.com/pantsbuild/pants/commit/726ad53f22d132770a67e68ec62487888bb4e531