3.6/news 3.6 dev merge

Merging 3.6/dev into 3.6/ipad-news to resolve conflicts