Fix deprecated function usage
Merge branch 'master' of github.com:roundcube/roundcubemail
Bring back empty directories