Backports for 0.92.x (wishlist)

Two cherry-picked commits from git master which are not strictly bug fixes, but would be nice to have in current stable (IMvHO).

Feel free to reject (each commit introduces a new translatable string).