Fix production mail send config.
Merge branch 'yang' into dev