Follow rustc master (1add4dedc 2014-10-10)