Remove trailing whitespace
Merge from trunk
Re-implement Khronos OSX C++ header correction

This time, resize the array to avoid the segfault.
Merge from trunk
Whitespace change
Merge from trunk
Merge from trunk