Sync with OpenWRT trunk r43718: in-compilation bugs fixed