- up to 2.2.0; change how we package contrib into doc so -bi --short-circuit works again