Merge branch 'master' of https://github.com/konsolebox/geany into konsolebox-master