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