Set the default SMTP Port number
Merge branch 'develop'

* develop:
  Set the default SMTP Port number