Merge remote-tracking branch 'origin/master' into rollup

Conflicts:
	src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs

src/libsyntax/print/pprust.rs

@@ -2538,7 +2538,7 @@ impl<'a> State<'a> {
                             s.print_ident(name)
                         },
                         ast::PathListMod { .. } => {
-                            word(&mut s.s, "mod")
+                            word(&mut s.s, "self")
                         }
                     }
                 }));