Update to upstream version 2.3.7