4.0 oss#107

bidi47 wants to merge 3 commits into5.2dotkernel/dot-mail:5.2from

4.0-ossdotkernel/dot-mail:4.0-ossCopy head branch name to clipboard