Fix #2954
Merge pull request #3017 from jxs/master

Fix #2954, add virtualenv installation instructions to osx and linux