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

ba5eeea1e5Andrew Kelley committed on 6/5/2018, 3:28:30 PMparents7dd18297a09482
2 files changedLine totals unavailable