Squashed 'vendor/' changes from 5f7913c..5c366a9

5c366a9 A good change
7c2615b Merge pull request #1 from strahlex/vinny-some-awesome-work
8ff5f7c Changes from parent and my-subproject
70acabc Changed my-subproject from parent

git-subtree-dir: vendor
git-subtree-split: 5c366a959c0f7513175a022c5d6434ce3500067f
Merge commit '520a1e342ef54261f4f5df86c79a9b2d4e25da84'

Conflicts:
	vendor/mylib2