Set Tox ID to one line in profile
Merge branch 'Proplex-master'