Merge branch '3.3.x'
Merge pull request #6777 from rxu/ticket/17468 [ticket/17468] Send reset password link to email only