Merge branch 'master' of https://github.com/0swald/rewrite-integration-faces-easypack.git