Merging changes back into mainline.