[sync] 1.3.7
Fix bug? (no repeatability): #405
[sync] 1.3.7.1
Merge pull request #403 from otiai10/develop

[sync master] 1.3.7.1