Fix #71: BufferCache race
Merge branch 'master' of https://github.com/eile/Collage