Merge branch 'Updates'
install smtp module
Merge branch 'master' into Updates