am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge

* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36':
  Adjust the redirects for edu and a couple others.