v1.3.25
Merge remote-tracking branch 'upstream/master'