Merge branch '3.3/master' into 3.3/develop
upgraded SwiftMailer to version 4.3.0
Merge branch '3.3/develop' into 3.3/master