Merging in latest changes.