Squashed 'common2/' content from commit 3c227f5

git-subtree-dir: common2
git-subtree-split: 3c227f59b0b2438930d9e51c124d23a369ee2347
Merge commit '313d2cf3bfb15c31784eb017729ec456dc2020ff' as 'common2'
update
Merge branch 'master' of https://github.com/alex-fls/subtree_common
checking conflicts