Fix for firefox scroll bug
Merge branch 'firefox-scroll'

* firefox-scroll:
  Fix for firefox scroll bug