3.6/ipad news 36dev update

Update the 3.6/ipad-news branch with the changes to the main 3.6 development branch