[geany/geany] 11d0d5: Merge pull request #519 from techee/cxx_o2