[sync] 1.3.15.5
Merge pull request #469 from otiai10/develop

[sync master] 1.3.15.5