3d21d069d Merge pull request #6016 from patrickbkr/install-improvements