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

ce68dda4b6Andrew Kelley committed on 4/11/2018, 10:27:06 PMparents588116ced1b028
38 files changedLine totals unavailable