Conflicts: gtsam/geometry/CalibratedCamera.h gtsam/geometry/tests/testCalibratedCamera.cpp gtsam/geometry/triangulation.h gtsam/nonlinear/ExpressionFactor.h gtsam/slam/SmartProjectionFactor.h gtsam_unstable/slam/SmartStereoProjectionFactor.h tests/testExpressionFactor.cpp