Camera's got lost in the shuffle.
Merge pull request #3389 from meyar/master

Camera's got lost in the shuffle.