Merge branch 'master' into feature-nameless4
Migration to Nameless framework 0.4.*
Merge branch 'feature-nameless4'