Viewport no longer has to change camera position.
Merge branch 'origin/master'