[geany/geany] 632575: Merge branch 'master' of github.com:geany/geany