Merge branch 'master' of git.geeqie.org:geeqie