Fix #730571 on bugzilla.gnome.org
Merge branch 'master' into jkerihuel/indexing-sql