Simplify manual camera control code slightly.
Fix camera breakage when current relative-to object is destroyed.
Merge remote-tracking branch 'origin/master' into feature