am 365ed394: Merge "Typo in CameraParameters::set"

* commit '365ed394c4135d9d42082c85638c076aed4bd156':
  Typo in CameraParameters::set