Merge pull request #2068 from ey6es/master

Fixes for camera transitions, seeing inside head.