Merge branch 'master' of github.com:roundcube/roundcubemail

Authored by machniak on Fri, Nov 23, 7:07 PM.