2.2.0
Merge branch 'master' into 74-registration-modal