Merge pull request #2288 from evincarofautumn/c++-compat