Fix calculation of InlineCamera FOV
Merge branch 'rothko' into picasso