Squashed 'vendor/' changes from 7d166a3..95331a1

95331a1 Yes x 3
89c19a8 a

git-subtree-dir: vendor
git-subtree-split: 95331a1ebdf627e418803b51b942e274ade900f5
Merge commit '9092e4ef24fbc89557f288412a44355efdf8a437'