[MERGE] upstream
[MERGE] upstream
[MERGE] upstream
[MERGE] upstream
[MOV] move redirection headers from webclient to server
[FIX] redirect_with_hash firefox bug
[MERGE] upstream
[FIX] local_redirect() should forward code to redirect_with_hash()
[MERGE] server side login