Code

Merge pull request #2 from mfournier/preparing-5.5.0-3