Merge pull request #4813 from pgavlin/gh3058
authorPat Gavlin <pgavlin@gmail.com>
Fri, 13 May 2016 13:30:46 +0000 (06:30 -0700)
committerPat Gavlin <pgavlin@gmail.com>
Fri, 13 May 2016 13:30:46 +0000 (06:30 -0700)
Disable FEATURE_MERGE_JIT_AND_ENGINE on *nix.


Trivial merge