Fix OS X build
Merge branch 'master' of https://github.com/BlueBrain/DisplayCluster
Fix build with gcc 4.4
Merge pull request #95 from eile/master

Fix build with gcc 4.4