Squashed 'vendor/' changes from c83b8fd..8072ef1

8072ef1 test

git-subtree-dir: vendor
git-subtree-split: 8072ef1a9d5b62644fea7593a9451c05a21f5300
Merge commit '869592d70c4c89c90af17aa34b9e32a2a1190366'