if you want to merge, feel free to go for it - my change: https://github.com/pantsbuild/pants/pull/2246/files