Fix build after latest Collage changes
Cleanups
Merge branch 'master' of https://github.com/Eyescale/Equalizer
Use Eyescale/Collage#27 to simplify synchronization of static objects