Add CSRF checks to user-edit page
Merge remote-tracking branch 'upstream/master'