camera fix
Merge remote-tracking branch 'origin/october' into october