Merge changes to installation and getting-started back to 3.5