3.6/news 3.6 dev merge

Merging 3.6-dev into ipad-news