Includes previous changes from trunk Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r38564 SVN-Revision: 38617