Fix indentation and source formatting
Merge branch 'bypass-activation-email-extauth'