Updated to libetpan 517a7fb7c4