Revert "Merge branch 'master' into osgiR8"

This reverts commit bf506346ff2c91a60986226f0f26f5c2e7866548, reversing
changes made to dabb1b38eaf020bb0f97ea331a3f6c5e5aefe565.
97 files changed