0.5.5
Merge branch 'release-0.5.5' into develop