am 315a23dd: am 711343d4: am f3136431: am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge

* commit '315a23dd1a0b40b38799c4ef052a5970781d39f2':
  Adjust the redirects for edu and a couple others.