sync with libextra and bump