Merged branch 'jetty-8' into 'master'.