Don't update camera twice.
Merge branch 'origin/master'
Merge branch 'origin/master'