Merge pull request #938 from zouyx/add1.5.5

Ftr: Release 1.5.5-rc1