Sync with OpenWRT trunk (rev.40859)