Fixed CLKit merge conflicts.
Didn't merge properly.