Handle zooming whenit is inside a scrollable element when it is not the main body element.  Resolves issue #435.
Merge branch 'issue435' into develop

Resolves issue #435.