FIX: Resend activation email was busted
Merge remote-tracking branch 'origin/stable' into pkgr