Merge branch 'master' of https://github.com/webasyst/webasyst-framework into master3