Merge remote-tracking branch 'origin/stable' into pkgr

Author: crohr

app/views/robots_txt/index.erb

@@ -16,5 +16,14 @@ Disallow: /search
 Disallow: /search/
 Disallow: /tags
 Disallow: /tags/
+Disallow: /email/
+Disallow: /session
+Disallow: /session/
+Disallow: /admin
+Disallow: /admin/
+Disallow: /user-api-key
+Disallow: /user-api-key/
+Disallow: /*?api_key*
+Disallow: /*?*api_key*
 
 <%= server_plugin_outlet "robots_txt_index" %>