bravier and adrienverge Update to new upstream version