Merge pull request #2152 from avsej/geeqie-1.3