fix signal dispatch
Merge remote-tracking branch 'upstream/master'
fix urls for password reset
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into content_translations