Merge remote-tracking branch 'origin/jetty-8'