Upstream 1.3.9 release
Merge branch 'vendor'
Changelog