Make cafebabe 2.10 compatible

I suggest branching the current master to "2.9.x"