Incorporate changes through March 2014, except for
drwxr-xr-x - dwarf5