1.3.8 release prep
Merge remote-tracking branch 'upstream/master'