[geany/geany] da3123: Merge pull request #2596 from napcok/master