[sync] 0.8.5.5
Merge pull request #320 from otiai10/develop

[sync master] 0.8.5.5