Merge pull request #92 from eile/master

Fix build against latest Lunchbox
CR Eyescale/Lunchbox#85
Merge pull request #93 from eile/master

CR Eyescale/Lunchbox#85
Merge branch 'master' of https://github.com/Eyescale/Collage into issue40
Fix barrier unit test