0.5.4
Merge branch 'release-0.5.4' into develop