Merge pull request #3747 from wsoltys/viewport