@Dave: patch for kilo fail to apply with current master, imports and tests needs a little bit of adjustment
@Dave: patch for kilo fail to apply with current master, imports and tests needs a little bit of adjustment