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