Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-29 dad105ff4110e29a584af3e5dc75c0f3cfcd0dce

1
2
3
4
pwcheck_method: authdaemond
log_level: 3
mech_list: PLAIN LOGIN
authdaemond_path:/var/spool/authdaemon/socket