Merge upstream fixes for installation.