Not sure why this is showing up as a diff. The cmv3 branch is already at c6ad81e.