Fixed OC issue, merges from latest linux 3.8.1