Merge from trunk and apply standard C changes.