Entire window is now the stage.
Merge branch 'master' into gh-pages