Merge branch 'new-install' into all-in-one-plus-setup.py