Upstream 1.3.9 release