Merging Jersey master into my local fork