Use @thomascube's roundcube add-on fork.
Merge branch '0.6.x' into gh-pages