Ensured that the patch for Bug #925192 is contained within the Camera refactor.
Had to merge with dmarcos/camera-refactor to resolve conflicts.
Merge pull request #15 from justindarc/camera-refactor

Ensured that the patch for Bug #925192 is contained within the Camera re...