Pull in changes from OpenGV Master