Revert "Merge branch 'cpp11'" This reverts commit ee09def802f9883056a2dc43136e65922dcccee2, reversing changes made to c3293b1a1cea3cdd9858b00c2a34d783347e72c3. Conflicts: CMakeLists.txt