[geany/geany] 05e5f7: Merge branch 'master' into tm/tree-refactoring