Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319
typo fix
Cleaning up conflict with merge of #2330