This will hopefully fix bug #9360 and #9097 in trunk. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33596 3c298f89-4303-0410-b956-a3cf2f4a3e73