We are vendoring from the Git source for now, so the bug fix turnover can be quicker if there's anything wrong in the resolution logic. HEAD up-to-date as of 2020-03-12.