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

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