Merge branch '3.1/master' into 3.0/master
Merge branch '3.1/master' into 3.0/master
Merge branch '3.1/master' into 3.0/master
Merge branch '3.0/master' of github.com:LendioDevs/email into 3.2/master