Merging 3.6-dev into news