Merge pull request #101 from it-workshop/wp/CAROLINE-30/1

CAROLINE-30: Fix singleton compilation on gcc.
(cherry picked from commit 94e09a3f228c4ed00443c92bb98e9a33d98e3d0d)
Merge pull request #102 from it-workshop/wp-1.0.0/CAROLINE-30/1

Merge pull request #101 from it-workshop/wp/CAROLINE-30/1