Merge branch '1993-confirm-users-on-registration' into 'develop'