Bastion: preventing body scroll, fixes #2643.
Merge pull request #2644 from waldenraines/bastion

Bastion: preventing body scroll, fixes #2643.