Updated the position of the camera
Merge remote-tracking branch 'nils_upstream/master'