Merge tag '2.5.4' into develop

2.5.4
Fix small incompatibility with Python 2.6
Small typo
Bump version to 2.5.5
Merge branch 'release/2.5.5'