Merge branch 'master' into

diff --cc src/libsyntax/ext/deriving/generic/mod.rs
Simple merge

diff --cc src/libsyntax/ext/expand.rs
Simple merge

diff --cc src/libsyntax/print/pprust.rs
Simple merge

diff --cc src/test/auxiliary/custom_derive_plugin.rs
Simple merge