Merged Coopervane's changes back in to repo.