Make sure we don't bubble up past the body element.
Merge branch 'issue435' into develop