Merge 3.1.5 kernel