Merge commit 'b1637825' into manualmerge

Conflicts:
	scripts/app_engine_server/redirects.yaml

Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025

scripts/app_engine_server/redirects.yaml

@@ -655,18 +655,22 @@ redirects:
   dst: http://www.youtube.com/user/androiddevelopers
   type: permanent
 
-- src: /playbadge
+- src: /playbadge/?$
   dst: http://developer.android.com/distribute/googleplay/promote/badges.html
   type: permanent
 
-- src: /deviceart
+- src: /deviceart/?$
   dst: http://developer.android.com/distribute/promote/device-art.html
   type: permanent
 
+- src: /edu/signup/?$
+  dst: https://services.google.com/fb/forms/playedu
+  type: permanent
+
+- src: /edu/?$
+  dst: /distribute/googleplay/edu/index.html
+  type: permanent
+
 - src: /edu/signup
   dst: https://services.google.com/fb/forms/playedu
   type: permanent
-
-- src: /edu
-  dst: /distribute/googleplay/edu/index.html
-  type: permanent