Updated to libetpan 6f269a36acd60e793368ed06abc518d0dfbfb6d7