Fix for Firefox poorly scrolling to anchors
Merge branch '2.0'