Squashed 'extra-addons/oph/' content from commit f74d9d6

git-subtree-dir: extra-addons/oph
git-subtree-split: f74d9d6b8603a5b1868ffba6e45a5279c464d337
Merge commit '61cdf600638f3babaf1284183df9ee93c3923c82' as 'extra-addons/oph'
modification