Fixing Windsor singleton registration issue (#1136)
Merge pull request #1140 from mauroservienti/issue-1136

Fixing Windsor singleton registration issue (#1136)
Merge branch '4.0.0' into develop