Merged security patch.