Upstream version 3.8-6