Fixed camera drift problem.
Fixed stash merge conflict.
Merge branch 'master' into occlusions