Use 78 character column in C files
Merge remote-tracking branch 'origin/master'