Update with latest upstream version (2.3.8).