Merge branch 'release-v0.5.1' into error-pages
Updated error pages
Merge branch 'error-pages' into release-v0.5.1