Merge commit 'origin/bug_448_fix_wlanscan'