Development tree with branch to be merged in libotr upstream