Sync with marcuscom, and try to fix build of gnome-documents