Updated to libetpan 88a41b8a3bb02e0ad4b44975aa03e9e26f738e7d