Changes to camera for better editor support
Merge branch 'suribe3'