Merge pull request #117 from benoit-pierre/fix-suffix-folding

Fix suffix folding
make release 2.5.5
Merge pull request #118 from balshetzer/master

make release 2.5.5
Merge remote-tracking branch 'upstream/master'