Fix 3g connection problem
Merge remote-tracking branch 'origin/master'