Merge in changes from mainline
tree61a721b20cf1fbf10ba726314d2d88eb362a077b
drwxr-xr-x - gcc