Attempt to limit the maximum extent of the question to window-height
Merge branch 'master' into staging

* master:
  Attempt to limit the maximum extent of the question to window-height