Merge "Fix issue with creating virtualenv"