ticket:5 virtualenv
Merge branch 't5_make_editable'