Fix Issue 11696 - incorrect static C++ member mangling
Merge pull request #2928 from ibuclaw/cppclass

Fix Issue 11696 - incorrect static C++ member mangling