See also http://llvm.org/PR30199
Chris, is this OK to merge to the 3.9 branch: https://reviews.llvm.org/rL281957
Yep, lgtm.
Go ahead and merge. Please closed this bug and add the revision number when your down.
Cherry picked in r282615