Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-28 d1923498c73ceef785748b5464e05d8fe383e5ea

1
2
3
4
 
amavis unix - - - - 2 smtp
        -o smtp_data_done_timeout=1200
        -o smtp_send_xforward_command=yes