0.5.3
Merge branch 'release-0.5.3' into develop