Don't send a join email in create_from_salsa
Merge branch 'refs/heads/develop-fftf'