scroll support
Merge branch 'master' into jetty7