Merge remote-tracking branch 'wberrier/master' into master
-rwxr-xr-x 6480 mutt-ldap.py