Squashed 'dir1/' changes from 93065b1..5ff2084

5ff2084 no message

git-subtree-dir: dir1
git-subtree-split: 5ff208473a67436feb888fe090568b64f6ab9aac
Merge commit 'baea077824ce358e165298abe3a13e89575b2ce5'