Merge pull request #14231 from fiigii/fixintrinsic
authorViktor Hofer <viktor.hofer@microsoft.com>
Wed, 27 Sep 2017 23:10:40 +0000 (01:10 +0200)
committerGitHub <noreply@github.com>
Wed, 27 Sep 2017 23:10:40 +0000 (01:10 +0200)
fix bugs from #14164


Trivial merge