Merge remote-tracking branch 'github_caclark_geeqie/master'