Merged changes which had been done in the original repo.