[geany/geany] e3fad4: Merge branch 'master' into wip/better-php-parser