Psudeomerge to tie in llvm-toolchain-3.9 upstream history.
authorroot <root@cuboxi4x4.Home>
Thu, 6 Jul 2017 20:39:58 +0000 (21:39 +0100)
committerroot <root@cuboxi4x4.Home>
Thu, 6 Jul 2017 20:39:58 +0000 (21:39 +0100)

Trivial merge