backport change from trunk
drwxr-xr-x - openwrt