Merge remote-tracking branch 'origin/master' into jetty-9.1