Merge commit '51009e33d1e0c3511edbb4c6cb5d71d559eda281' into production
Only send mail when granting > PUBLIC site authorization

Fixes #1942
Merge branch 'production' into staging