Merge branch 'master' into 'eog2'

# Conflicts:
#   src/eog-list-store.c
1 job for eog2 in 10 minutes and 34 seconds (queued for 1 second)
latest