Merge commit 'origin/bug_175_wlan_connection_problem' into experimental