Accept Merge pull request to llvm source code trunk

Merge commit 'e85d0d46a198ccf39ea336bd7ef7a98a6836f8d7'