Merge branch '5.0.x' of github.com:/hs-web/hsweb-framework into 5.0.x

Merge branch '5.0.x' of github.com:/hs-web/hsweb-framework into 5.0.x #63