Version 1.3.8.
Merge branch 'v1.3.x'