Merge commit 'origin/bug_204_wlan_automatic_scanning' into experimental