Squashed 'vendor/' changes from 95331a1..c83b8fd

c83b8fd develop

git-subtree-dir: vendor
git-subtree-split: c83b8fd78d357c90f8c67e39ef3e79eabd94e13b
Merge commit '243353284f11c9c8dc0be3ea6bf8296af598e885'