Merge pull request #926 from nico/fixlibcpp