Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'