Merge branch 'redirect_via_sock'