Merge pull request #5075 from tsocha/master
authorCyprien Noel <cyprien.noel@gmail.com>
Sat, 14 Jan 2017 19:56:35 +0000 (11:56 -0800)
committerGitHub <noreply@github.com>
Sat, 14 Jan 2017 19:56:35 +0000 (11:56 -0800)
Fix mkl issue #4836


Trivial merge