[geany/geany] 60147a: Merge pull request #857 from techee/cpp_h