Merge "__gnu_basename(3) is accounted for."