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