Merge cpp{98,11}
Fix severe bug found in ccw