Sync changes from evolution-data-server: https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28 Closes https://gitlab.gnome.org/GNOME/evolution/merge_requests/37
Sync changes from evolution-data-server: https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28 Closes https://gitlab.gnome.org/GNOME/evolution/merge_requests/37