Remove all references to @Single (since it was disabled in Optims)
Merge branch 'master' of https://github.com/StephaneSeyvoz/global-extensions