Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts: program/lib/Roundcube/rcube_ldap.php