Squashed 'modules/' content from commit 5a58fc2

git-subtree-dir: modules
git-subtree-split: 5a58fc2b933941572896f31f7c6309b552dfae82
Merge commit '19d4e10ed01fc11ae51bd21b06eb9906af49d670' as 'modules'