merged #6171 <https://github.com/pantsbuild/pants/...
# announce
a