Squashed 'extra-addons/aeroo/' content from commit 3277a7b

git-subtree-dir: extra-addons/aeroo
git-subtree-split: 3277a7bc990235fee1bafc2987eff7dca469f1a1
Merge commit '13002c7b9385572521722676a3373426963a18a8' as 'extra-addons/aeroo'
Squashed 'extra-addons/oph/' content from commit ecfccd4

git-subtree-dir: extra-addons/oph
git-subtree-split: ecfccd487c249009b358269dadbd6d3d402d3873
Merge commit '2eebbd5f099d25e1a5ccc88a885769c38693730b' as 'extra-addons/oph'