Revert commit -- turned off emails that should be sent.
Merge branch 'develop-fftf'