Squashed 'subtree_dir/' content from commit b272dbc

git-subtree-dir: subtree_dir
git-subtree-split: b272dbcc195e0b4f5f82e1fc364f0260ec78a1aa
Merge commit '38bc4ba8479081afe7528e93ade3967fbcaed680' as 'subtree_dir'