Comment 2 for bug 1543298

I committed the fix in r14642 since it was a major inconvenience and prevented from building with CMake, I'm not sure if there is anything to sync back to lib2geom or if it was all there was to do.