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

* commit '90b9ab16f9f8730f69905f56055c5364d26ce888':
  Adjust the redirects for edu and a couple others.