Merge pull request #2653 from ey6es/master

In addition to pushing the camera back to avoid intersecting, also narrow the field of view.