Merge r313998 into 5.0.1

[llvmbot]

Bugzilla Link	34703
Resolution	FIXED
Resolved on	Sep 28, 2017 10:52
Version	4.0
OS	Linux
Blocks	#33840
Reporter	LLVM Bugzilla Contributor
CC	@tstellar
Fixed by commit(s)	r313998 r314437

Extended Description

Please make sure that r313998 gets included in 5.0.1.

[llvmbot]

assigned to @tstellar

[tstellar]

Hi Tim,

Is this OK to merge to the release_50 branch?

https://reviews.llvm.org/rL313998

[TNorthover]

Yep, looks fine to me.

[tstellar]

Merged: r314437.