Fix build against latest Lunchbox
Merge branch 'master' into issue40
Cleanups following Eyescale/Lunchbox#85