Camera upstream

Test "pull request" feature of github