Merging in changes with my mainline.