improve robot and intranet detection; suppress email for non-intranet clients
Merge commit 'github/testing' into beta