This also saves one HTTP redirect
(cherry picked from commit 09b6b8e32fe1e46e1f69d8dec0df29975a83f649)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>