Merge branch 'bug_204_wlan_automatic_scanning'