am 5561ecff: am 077bc4ac: Merge from open-source master

* commit '5561ecff7bdcb8a8f377d442ca64ee87ee1356b8':
  Fix HTTP redirect missing statuscode 303 and 307